Fix for #340200, spotted by Torsten Schoenfeld.

2006-04-30  Kristian Rietveld  <kris@imendio.com>

	Fix for #340200, spotted by Torsten Schoenfeld.

	* gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
	calculating the level indentation,
	(gtk_tree_view_start_editing): remove code calculating the
	level indentation, since _get_cell_area() takes care of this for us.

diff --git a/ChangeLog b/ChangeLog
index b8a952aabb0f5b0d88a0dd200f736837f585b9b2..f606fc1c8b5ec0f393962d3820112997d8829af6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-30  Kristian Rietveld  <kris@imendio.com>
+
+       Fix for #340200, spotted by Torsten Schoenfeld.
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
+       calculating the level indentation,
+       (gtk_tree_view_start_editing): remove code calculating the
+       level indentation, since _get_cell_area() takes care of this for us.
+
 2006-04-30  Matthias Clasen  <mclasen@localhost.localdomain>
 
        Fix problems with setting symbolic colors from rc files.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b8a952aabb0f5b0d88a0dd200f736837f585b9b2..f606fc1c8b5ec0f393962d3820112997d8829af6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2006-04-30  Kristian Rietveld  <kris@imendio.com>
+
+       Fix for #340200, spotted by Torsten Schoenfeld.
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_cell_area): fix up logic
+       calculating the level indentation,
+       (gtk_tree_view_start_editing): remove code calculating the
+       level indentation, since _get_cell_area() takes care of this for us.
+
 2006-04-30  Matthias Clasen  <mclasen@localhost.localdomain>
 
        Fix problems with setting symbolic colors from rc files.

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 1fff6384fff7de423ea0d15453bf57c5a3dfed5b..e92e3ad63909afec86f6dec30e4776c3a8f16247 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11847,13 +11847,10 @@ gtk_tree_view_get_cell_area (GtkTreeView        *tree_view,
       if (column &&
          gtk_tree_view_is_expander_column (tree_view, column))
        {
-         gint depth = gtk_tree_path_get_depth (path) - 1;
+         gint depth = gtk_tree_path_get_depth (path);
 
-         if (depth > 0)
-           {
-             rect->x += (depth - 1) * tree_view->priv->level_indentation;
-             rect->width -= (depth - 1) * tree_view->priv->level_indentation;
-           }
+         rect->x += (depth - 1) * tree_view->priv->level_indentation;
+         rect->width -= (depth - 1) * tree_view->priv->level_indentation;
 
          if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
            {
@@ -13474,20 +13471,6 @@ gtk_tree_view_start_editing (GtkTreeView *tree_view,
                               tree_view->priv->focus_column,
                               &cell_area);
 
-  if (gtk_tree_view_is_expander_column (tree_view, tree_view->priv->focus_column))
-    {
-      gint depth = gtk_tree_path_get_depth (cursor_path);
-
-      cell_area.x += (depth - 1) * tree_view->priv->level_indentation;
-      cell_area.width -= (depth - 1) * tree_view->priv->level_indentation;
-
-      if (TREE_VIEW_DRAW_EXPANDERS (tree_view))
-        {
-         cell_area.x += depth * tree_view->priv->expander_size;
-         cell_area.width -= depth * tree_view->priv->expander_size;
-       }
-    }
-
   if (_gtk_tree_view_column_cell_event (tree_view->priv->focus_column,
                                        &editable_widget,
                                        NULL,